changed tests and one class