Removed debugging artifacts
Refactored EC2 test to follow module structure.