Fix tests and classes