Finish initial histo tests, fixes #7