added a test and fixed a bug.  i had messed with model keys and caused
some breakage.