Fixing unittests master


@butonic @icewind1991 @MTGap @karlitschek  THX