tie up a few loose ends in keyword args, add a couple more tests