Added some more tests, with no implementation