Fix unit tests for the eppn changes