Enhanced test. Thanks to @mikemcquaid