This test and the one above sort of get lost amongst the other entities and functions defined within here.  Possible to re-structure or at the least, put all tests at the bottom?