Added communication changes and test resolution