[PLXCOMP-107] Testcase added, works as expected
[PLXCOMP-234] Remove useless options

Patch by James Henderson, rebased/realigned to current master
Removed duplicate statement