fixed few failed tests