tests pass again after HMSS refactor