Fix usage, test for args