Significantly better API tests...