get test working after recent merges