Start refactor to OOP test