Polishing UNITTESTS
Merge remote-tracking branch 'origin/jim-stable-6-14' into userinterface