Actually, all the tests in this file don't need done.  Should this be addressed in a separate PR?