refactored this test to match the way we do tests

@maartenvg @costford