minor updates to classes (info)
removed some test classes, leaving two as templates