Added some more tests yet to be implemented