DJ: New test for much higher prime number and edge case arount that number. Further refactoring.