Cleanin validation in SVP

Should i repeat coverage test / riboflavin test for SVP preparation tank each cleaning validation activities ?

Hi,Im doing cv for SVP on the filling machine we take swabs then use TOC for analysis.My questions is this good enough to say my cv has passed.If my results fail must I start using HPLC to quantify what amount of product I have?