Comments, better test output and kickoff fixes