Few pylint fixes

Some pylint fixes.

Had to rename the tests files as per:
http://pylint-messages.wikidot.com/messages:c0103

The below link explains the above reg-exp

http://rick.measham.id.au/paste/explain.pl?regex=%28%28[a-z_][a-z0-9_]*%29|%28[A-Z][a-zA-Z0-9]%2B%29%29%24