Refactor tests to be more explicit