improve tests, fix prefix in args