Fixed usage display bug.
Added new tests.