Fix the tests

@maxfliri
@gtrogers