Re-added tests that were inadvertently deleted.
Authored by: dwarren 2018-02-02
Parent: [r9214]
Child: [r9216]