Updated test to workaround some issues
Authored by: artyom-beilis 2010-12-14
Parent: [r1581]
Child: [r1583]