Test refactor, not ready yet.