Fix unit test failures

@nukulb There is one that I can't fix