Attempt at fixing some of the pillar platform tests