Test clean up. Also raised model argument from set to collection.