Revert back to explicit character statement
Update test coverage