Add tests and code for category additions