Rename test methods.  Add some TODOs.