removed unused lines of code
improved test coverage
updated test coverage for expiration