making methods return adapter closures, updating tests