Merge "Adding a simple KeyGenerator test"