:shipit:  Would be nice to have unit test to positive/negative covering this.