Clean up unit tests, especially naming conventions