Added expiry timeout into options and refactored tests to use the "before" function to initialize tests properly