Fix tests, fix doc