Added additional tests for key/value issues,