[#4691] Fixed test failing due to unstripped diff path

Signed-off-by: Cory Johns <johnsca@geek.net>
[#4691] Fixed tests failing due to mocked or improperly persisted ModelCache

Signed-off-by: Cory Johns <johnsca@geek.net>
[#4691] Fixed broken SVN tests

Signed-off-by: Cory Johns <johnsca@geek.net>