- additional tests
- fix method names