Completed first set of unit tests exercising all methods.  Fixed a couple bugs as a result.  Also re-factored the should/expect lingo to 'expect error' where appropriate.