Tried to fix broken unit test bundle.