Worked on generic read sub.  Change unit tests to use it.