added test to check for proper handling of conflicting arguments; fixed order of args in assert calls
fixed side-effect of preserving modified values if arguments conflict
incremented version