Fix tests to run on ci