- Corrected unit test, which had the wrong expected output.
- Added TW-1267 unit tests (thank to Renato Alves).