Expand apiserver tests