Shored up some tests after refactor