dynamic keys and more tests