.gitignore
Fixed some test timeouts
Fixed tracking