update tests, fix collection saving getKey