TW-1306

- TW-1306 Arguments before 'add' are ignored.
Unit Tests

- Added tests for TW-1306.