Removing unused classes
Adding more tests
Still a major WIP
Temporarily removing equals check for calsubrecords