Added read methods and reorganized tests