Fix tests and test cleanup
- Remaining work: IT050, IT500, IT501, IT510, IT520, IT970, IT990
- Then rerun the build