test for #133 & #135, ready for review