Modified tests to run stand alone