Adding more tests, all passed