Added TEST_AREA to ui5 plugin, more cosmetic changes