Now accepting arguments again, and test to motivate it