Fix broken tests
Merge pull request #18 from areese/cleanup_user_key_loading

Fix broken tests