Changed how setting up/running tests is done, to support more than one api at a time