re #25 fixing up more stuff on test to get get build green