Small refactor to tests - no need to remember field changes now.