fmcs cosmetic changes. code clean-up. unit tests
disable two very long running tests
Merge branch 'AlexanderSavelyev-fmcs_port_21Feb2014' into fmcs_port_21Feb2014