Fix the tests

@liveh2o @localshred 
@tamird You're a rock star. Thanks!