Refactored the test into multiple files.