Split existing tests into separate files and classes to make it easier
to select a subset to be executed when making modifications.
Add some simple consolidations of test data as example improvements that
can be extended by consolidating complete tests or sets of tests.
Change-Id: If2380e6f4e848ba68f05868e2ef4186d7912952b
