updated conflicts with granularity and test philosophy