Bugfixes driven by test suite

Still 9 tests failing but doing better. Reporters need to be moved over, looks like the pickler has trouble.