update testing to support new https, include some cleanup of formatting