Fixes due to gatherer updates, renamed bootstrap unit test….