Began to refactor common expected behavior.