SETUP test, modified SETUP and .gitignore, and also removed files that should have been in gitignore.