Fixed a few tests, renamed a few files.  Shouldn't code so late.