Readying 1.7 release
Fixing tests for non-devs