fix tests to fit last modifications