Add some tests for #128