Test suite updates
Problem solved?