fixed#343 tests in Tom's way