extracting utils - removed tests files