created variables for expiration tests, moved time free method to top and removed repeat calls to it
created variables for expiration tests, moved time free method to top and removed repeat calls to it

tshr/omnivore,tshr/omnivore