fixing too much exception wrapping test and impl
2 files changed