Change the suspended and locked error messages

Change the suspended and locked messages shown to the user and fix the test for the suspension message.