Cleaned up tests with more descriptive naming