restructure test modules to look like processing modules, get tests working, clean