Onset unit tests and regression test refactoring for #48