v0.6.36 Fixed rest tests