Tests pass. Fixtures updated to a degree.