Improved code coverage
Fixed missing global #argv
Fixed 'Using  when not in object context'