added tests and created categories