Stop tracking testsuites. Refactor methods