Random model test improvements, CSOM 33/37, SSOM 31/37