Setup tweaks for new features - fixes dependant tests