more params to hydrator, add tests