More refactoring. Added test for read_lists
Merge remote-tracking branch 'origin/master'