Updated tests to use instance variable style.