Fix test class to use properties