Fix tests and remove unused fixtures