Does not work with remove tests.  Seems I forgot how pointer arithmetic works.  I need to think through this stuff again.