fix on expiration + tests refactor