dusting off and improving test granularity and coverage