Added keyCount measures to tests