Fixed indentation; changed tests to reflect new Char/String processing mode.