Updated tests and adjusted testIterations.properties file. Added automatic randomizing when desired row count < database row count.
Merge origin/master