Refactored tests into a suite with multiple files.