Updated the ExpectationLocator to support properly loading expectations