Re-order layers to avoid issues in certain test setups