Fixing test
Adding more tests