Clean up of feature-events prior to merge.  Also verifies all unit tests
pass