Post test cases for ept
Fix a typo
Bugfix from Tao
More fixes
testing merge