Fix tests, add done