fixes (take1)
updated test scripts