Refactor tests to be slightly clearer