Committing some new tests and fixing old ones.