Factorize more tests, fix previous factorization