Merge "improve dockerized test"