Corrected issues that caused failed tests