Merge branch 'stigger/uitests'