removed print statements, todos
merging new versions of test scripts