Refactor for less suite like testing.