[RD]{other} Cleanup of classes, some minor changes to tests