get rid of encounter tests that reflect non-current approach