Test -
 - Some test utils cleanup
 - More tests for MC_REQUIRED