tests and scripts cleanup