Category -> changes + tests