more tests and test scripts