Prepared before to create tests - Refactored to follow the existing convention - Cleaned up styles and other details