Fixed tests, mostly. Still broken.