Adding test cases for init stuff
Merge commit '126950f542af25feb802d079a594b5d168136bcc'