Work in progress for better Native Test Suite Container