- added new tests
- fixed review problems