Added a handful of unit tests