Fixed class names in test announcements.
Reduced the size of the integration tests.