small change to key stuff and test