Fix for test failure in LockMBeanTest #3716.

Test refactoring. Split tests up, added assertion messages to see where its failing.