Included generating primes in tests
Added prime factorization