Reverted some test settings