Added 40 tests and all passed without changes