Renamed unit test flag to be more generic/reusable