updates for test fix bugs
merged with remove