Merge pull request #85 from alex/explicit-api

Explicitly pass around the API, and run all tests under all available AP...