fix tests
fix tests
fixes by @galedric