Fixes for width/height & test folder repositioning