- Corrected mistake made earlier when assuming the first test was a 'control'. It was not.
- Corrected unit test, which had the wrong expected output.
- Added TW-1267 unit tests (thank to Renato Alves).