Clean up of test for #162