refactor tests to be more readable