Bug fix and test configuration