Updates to tests and some cosmetic fixes.