Simplified mapping tests by making sure collections are equivalent. Make minor changes to the ideas to improve the readability of the API.