Bug fixing for Test and Sandbox account creation