Now with some more tests