Test cleanup

Standardized wording and returns of tests.