Added implementation for the collection search objects plus some tests (most of the are failing atm)