Adds in tests and fixes model code for setting expired_at as well as handles edge case for fulfilled and expired