* adapted tests to use new testshl include dir * took P1 masterfix also for this cws * more tweaks to get build done