allow for making keys mandatory
test corrections