Add shapeless (will need for serialization stuff)
Make the only test case more correct