MINOR: Added tests to accompany fix in #2382