Add Category Fixture and minor tweaks to other fixtures