Fix tests (maybe...)