added YES/NO and cleaned up tests for M