Work in progress for better test suite container