tested up to 1000
A couple of changes to the test