fix failing tests
fix tests to prepare the right behavior