Change name of init/shutdown, add tests