Fixed up unit tests for epp & ss