BUG: fix tests for good.