WIP fixing api tests, apiserver tests complete