Combined REST and MODEL tests into one file. #300.
Merge pull request #335 from Kae7in/david-issue300

Combined REST and MODEL tests into one file. #300.