Spent the whole day getting the tests to pass again.  I still need to finish up the before actions.