Fix up unit tests in line with recent bugfixes (especially the switch from async to sync HTTP requests)