fixed failed tests and added new