More test organizing.
Re-enable APITest.