Cleanup delete
Update tests