Improved TestSettings