Expand apiserver test cases

Preparation for #722