Fixed some more stuff, got rid of some non-existent references.  Tests seems a little closer to running.