Fixed read link and minor unit-tests fixes