more tests and code for epm