Made into multi-collection package; fixed set tests