- [ ] before final merge - remove commented code in generator tests for bootstrap