Test cleanup: better naming