Reworking test in a more usable manner.  Planning to build out of it