Added more tests.
Added shim partial.