Updated tests to work with new Xcode version
Updated tests to work with sets returned from store
Updated user stories