rev 1.0 - support api_keys and fix a few now out-dated tests due to depr...

...ectation warnings