Added some more tests.
revert 36a8c17f2648a530cc877c49df2eb75f8ec1d01a
Merge remote-tracking branch 'upstream/master'