Test done, next: OOP it