Add category and tests
Add style and test