Switched dmcc abstraction to use inidividual test_modes rather than overall