Fix tests and related fixtures