Removed duplicate tests and easier to use TestOAuthConsumer script

Change-Id: Ia4284afee13f8248def41027cbfb28c26d42f7bf
Merge "Removed duplicate tests and easier to use TestOAuthConsumer script"