Revert "fixed collection_select arguments"

This reverts commit c947a76e03045843e5dd7664c898b337a489b4ac.
Clean up tests a bit