all tests implemented. should all pass.
Fixed apikeys showing
Merge pull request #1 from ak88/master

Merge