+Nishant - speeding up the tests
+Nishant - added code to update config settings