Cleaned code and updated test data