Refactor unit tests, simple behavior.