Finished test refactor.  Still shows issue