test1 done
merging tests