H5: clean up unit tests, parameterize