Test mostly integrated in with refactoring changes made today now.