Added kvp testing, not working, yet.