Change kv to plist and fix tests