Try to fix tests for new machine state behaviour