Tests: Adding test to expose flaw in current key management scheme
Tests: Making issue more explicit
Tests: minor tidy