add mode to key and key tests
update keys to use modes not thirds