Updated test code paths.