Modified layout to support multiple scenarios in different tabs, cleaned up integration tests.