Updated proxy configuration JavaDoc
Updated remote configuration JavaDoc
Minor test clean up
General code clean up