Fixing more failed tests