Fixing the tests and adding a few more