Anti-virus testing guidelines coming early next year