Renamed bootstrap

Made it caps to go along with all of the existing test names
Knocked out unit tests for the new Router