Replacing Test-Classes with a list of classes in preparation of switch to JUnit4.

Signed-off-by: Tristan Bull <tristan.m.bull@gmail.com>
Updating TestBundle2 and TestBundle3 unit tests and integration tests to JUnit4.

Signed-off-by: Tristan Bull <tristan.m.bull@gmail.com>