refactor for component-test goodness