added tests
Category specs models and migration
fixed merge conflict