Revert "praveen|fixing tests"

This reverts commit ccb1687561c7ec4769b55a53b87bb18d22bd4a30.
Revert "praveen|moving encounter matcher loading from startup to first time execution of findEncounter"

This reverts commit 9cc7876059a750ab5f9caac49ac177b65e33b679.