Tweaked command line test app