Rewrite these tests without category model