localStrategy tests pass after port to new co & minor fixes