ok now hopefully really fixed tests