Test: refactored files for consistency.