before merge
Fixed tests under XP