Cleaning up more kwarg issues
Update example code (not prose) so tests are useful