Merge "Adapt test jobs to stack oriented framework"