finish rewriting record tests
move test include files
remove extraneous include flags from test sources