Modernized a few OOP tests