Renaming, clean up of Boot.
Added test to specify behaviour at boot.