Fix key names and unit test