deleted simple_test1 after merge