fixed failed tests. sync