Added keymatch field

Tells you wether a key matches.
This could be used when you can use a return value to validate
Updated test setup
Removed TODO's because done