Add expire method and tests