Upgraded category test and skipped broken tests