Simplify the header
Remove HSIC unit test