Fixed TestBuilder and PrettyPrint for html