AME-4645 CR-4680 Remove duplicate and unused subject and environment conditions and update unit tests accordingly.
Moving the tests