tests clean-up
fix script tests