Fixed revert commit issues with Unit Test classes