more fiddling to try to get tests working