Misc. changes, mostly to anomaly tests.