It's about time we finish up this part, to make it even easier to test against more APIs, and keep them up-to-date