Refactored test names to have some consistency