Class updates and last tests