Fix tests, add fixtures