Updated tests, modified .gitignore