Add test scaffold and better logpath name