Fixed few failed tests