Fixed the test hierarchy structure
Added tests to check custom control char inputs

Added tests that check the various usage of different terminals such as
custom delimiters and/or separators.