Neha | #244 | fixing encounter and test order save tests. Minor refactoring.