- added EOM
- added some further tests