Written some more tests