Cleaned up some redundant code.
 Added unit test for alternative site URL.