better tests for #18