#755 - gather bootstrap state functionality, new tests