simplified expiration date api and updated unit tests