update tests and classes