Add Fixes suggested by Sebastian Bergmann
Merge pull request #1 from javigomez/jlayout-systemtests

Add Fixes suggested by Sebastian Bergmann