+Add Case class and tests for it