Fixing visibility issues and Logging in test classes.