Initial test scripts
adding initial test scripts
Attempting to resolve git merge conflicts
Attempting to resolve further conflicts