update tests
bug fix for init
merge keys