Cleaning up tests.
Updating .gitignore.
Revert "Cleaning up tests."

This reverts commit 4775cc929fd0947ef600a6f3ead3a1e8ba539e69.