Improved app id and key passing to client test cases.