Removed useless parameter
Added tests for expiry threshold