refactor Boot.pm and fix 1 test