Fixed more read fns and tests