More updates for M4, all Unittests pass