Fixing the tests and adding a new test