Prepping for Integrating testing with Driven
Fixed initial bug during unit-testing. More to come