better "usage" output, new test