Fixed failed tests from last submission and added new files for this iteration