Updated testsystems with new tests, variants, and additional options

I've added some new tests, variants, and additional options.

Should be ready to merge.