Making changes to the tests and starting collections implementation.