refs #639 - changed test skeleton for fixing test for mvc-new
refs #639 - fixed tests
Merge branch 'FB_639_FIX_TESTS'