Added some more helper methods.
Added 2 more tests just for sanity.