Changed build to be more unittest friendly