TEST-3 This commit fixes XWALK-34 and also fix XWALK-43 and sometimes fi...

...xed XWALK-1 but finally TEST-2 and also fixXWALK-5I think but in some cases could also resolve XWALK-43, has resolved XWALK-54 and resolves TEST-1. If I feel like it I can close XWALK-3 wiht it. Oh wait, I closed TEST-4