@gregsymons test cases were too outdated to be ported easily. The new tests should include the coverage of the old ones.