Adds tests for #26