Class updates and tests