Reverted testing code
Merge branch '389_captured_values' into 389_with_QUnit_tests