cleanups to the collector test
convert search engines collector from EventEmitter to a Class based object to keep up with the SDK changes