Updates to unit test script