- updated tests
- Fixed new tests