Tests 010614

New large data tests + a few minor fixes.