Worked more on ERAT unit tests