Tests: Clean up code and file structure