Refactor unit tests again