Added collections, exceptions, improved test data