Fixed encounter tests.  All tests should pass now