more test added and modified