fix tests to prepare the right behavior