Implement base case classes, add test class