Merge "Additional test state fixes"