merging test into 1