finish init tests and bug squashing