fix, tests
3 files changed