updated tests to match [bugs:#2663]
7 files changed