Add improved initialisers and begin label test