more combined heatsheets work and new test files