renamings
reorg test + comp functions into classes that are basically 'function bags'