Add two new tests.

This is primarily for JVM, but should work anywhere.