More tests and removed unused args.