Some fixes of regression test after some changes in code
Authored by: artyom-beilis 2010-06-15
Parent: [r1285]
Child: [r1287]