Feature/34 keychain lock bug

Fixes #34.

Oh and I also felt like this would be a good time to split the tests by level and type.