Merge "Enable epc unit tests"