Shored up some tests