Initial tests for #141