Ignore files, fix tests.
Superficial changes.