code refactor; test infrastructure support.