Corrected makeSubkeys to return the right lists and also put a basic
test in place for it.