Prepping for integration of test suite