Added a few more tests just to be on the safe side
Done, ready for submission