Fixing a few errors in the applicability manager and api implementation and updating unit tests