Fixed initialisation fault and failing test.