- add integrity checks in tests
- make tests independent