fix category tests (some still fail, but there are no more errors)