Support for remove and tests