Minor changes to readmodel test program