remove reduce wrapper; more tests