Refactor tests to have better naming