Fix some includes, gen schema, got rid of PHPUnit from composer