cleanup
- added features from external branch
- added missing tests
commented test