Added OOP test classes