cleanups and minor fixes
added PreservedNotNullConstraint metric and tests