Remove 'test-mode (variable not used)
Add bug#84 test