Added test for key finding.
Fixed bug in keyfind.
Merge branch 'test' into dev