Added tests to #2367