Bacported fix.
Added ref for fixtures.
Updated tests and stuffs.
Fix.
Merge branch 'stage_three' into stage_boss

Conflicts:
	spec/defines/testing_option_spec.rb