Remove reference to testsettings.
Merge remote-tracking branch 'origin/master' into dev