minor fixes to get test running correctly