refactor non-hydrus tests to be more compact