Progress, removing buildheader/, fixing up some tests