[Tests] ApiTests all pass again.