Add more tests, to be sure