Merge "Move tests: unit/apiserver/"