Rtests2 (WIP)

Expanded server route unit tests to cover more error cases. Diffs route still needs debugging.