bug#1679 tests amended