cleaning up includes, adding option to run test set