Add formal header, tests