Filter out case classes. Add more tests