cleaned up code and error messages
added old command-line options to deprecated list, updated test case
updated and shortened test cases