Random model test improvements, CSOM 29/37, SSOM 20/37