Test custom registration
Add missing header
Fix file header
Add missing headers