Fix tests?