adding more test coverage and etc.
fixing scripts