Rewording some test names