fixed ref tests for the code structure
Merge remote-tracking branch 'upstream/master'