Should add some more tests