Added a test to see that Duration with Expiration is removed correctly.
Added a test to see that Duration with Expiration is removed correctly.

tpoikela/battles,tpoikela/battles,tpoikela/battles,tpoikela/battles,tpoikela/battles