tests added, bug with remove found