Added a few more tests (#3)