Fixed up more invocations
Fixed up test script