fix Javadoc warnings
use try-resource for all readers in tests
use try-resource for all readers, simplify redundant else blocks