Basic unit tests.  Also added some methods and added const modifier as appropriate