Fix logic for ReadableSeconds and add tests