updated test
fixed a merge issue