Some cleanups
Starting collectionprocessor tests