Updated tests to take advantage of class member access on instantiation