Fix test
First pass for #231