Remove associated test as well