Added tests 5 & 6; Fixed command-line processing
Improved automated tests
Updated .gitignore