More tests, reporting, bug fixes