Rename experimental header
Minor refactor test app