Cleaned up test names