Add even more tests (#7)