Fix apiserver tools serving
Fix tests