Fix tests

cruise is green: http://cruise.infopark:3000/project/show_build/18673