More test cases (my next few commits will be like this)

Added some test cases, and updated some methods here and there. You
know, the usual.