unit test:
- fix classes (updated to use current API)
- new unit tests for ep4