Fix tests for bootstrap generator