Fix tests and fixtures