Adding bit more testing for #581