separate flags for cfx command
fix a few unit tests that stopped since the update in the sdk