Adding and removing categories works now. Confirmed with unit-tests