Added some test methods. Lots of unit tests left to write.