Modifications from OpenADE task force call on Dec. 2 2014. Also marked all FB_14 tests as CMD tests.