simplying bucket / key lookup
updated test