More protected accounts refactoring. Fixing som common tests.