Additional updates and tests rob stuff

I think this should work for us.  I tried to make sure the tests were passing.  Wanna check it out?