tests only done if requested. removed spurious comment. replaced some literals with variables.