Quite expetedly - more test compilation fixes