a few corrections to applicability generation manager and unit tests