Fixing all previously broken unit tests.  Also adding in new tests for the collection classes and new types.