Some improvement in test1