Fix Makefile to ensure amd/commonjs tests are run.
Copy option values rather than ref options object.