some fixes to previous commit + test
3 files changed