Fixed minor style issues
Updated test code to make it easy to parse cmd line args