Refactor HasTest to use new test model.