improve expiration testing
update version