Minor renaming + Added Mr. Venkatesh's test code