GUI-129
fixed unit tests