Remove expiration_filter method alias hack and add tests