Added some more useful headers
The beginnings of build configuration to separate out the performance tests - doesn't work yet though.