Test done, after fixing key count check