[MRG+2] Stricter decision function test

Closes #1490.
Done and merged.