added unit tests...

-refactoring of argument scheme parser
-bug fixes
-name changes