Test fixes

Fix up our tests so that they actually pass and also run them in 3.5.2, 3.6 and master with multisite and without multisite.