remove compatibility functions, they break add_collection
Handle limits and improve some names
add baseline images for test_collections