Minor Changes to tests

Bumped up the scale of tests to the millions.

Tests now use more sane timeout policies
Merge branch 'master' of https://github.com/DaMSL/K3-Core