Several fixed to pass all tests