Cleaned code and added TESTING class.