Updates to scratch-rest
Additions to several tests as well as good work on the rest project