Add init code
Resurect the functional tests