Corrected number of tests.
Added hack to ensure return of reads is always of correct length.