Started to add output options and unit tests.