Bootstrapping

* Getting more tests around bootstrapping
* Fixed failing test for the collections mapper