Refactor tests to read easier