More Test structure cleanup

Still need to set up mocks.  Will look at Squire next.