tests are fixed
8 files changed