add tests, remove references to dumper, some other stuff