changes I had to make for tests to run

This doesn't seem like a complete solution, but it did let us run the specs.  We continued to have 2 specs that fail locally, however.