Implement more arguments for test command