objectivize and put tests in