Fix remove and add tests