Attempt to fix the wrong state input from being logged
Extra M&L tests