Fix all test fails in master (just to check)#658

Merged

lsmith77 merged 3 commits intoliip:masterfrom kamazee:two_test_fixes

Nov 1, 2015

+73-32

Commits on Oct 30, 2015

Fix broken CacheResolver tests (liip#650 )
kamazee
committed

Commits on Oct 31, 2015