docs work, test cleanup, adding fix for #287