cleanup and test fixes
gitignore