more tests
keys
fix values