Fix beatrix test failures (missed in prevous commit)