make manual test work
add key path mapping and bug fix