Updated test names to comply with new naming convention