Refactored to use a fully generated function
Refactored out duplicate code and added argument arbitrary generator
Forgot to remove obsolete code