Cleaned the testing code