[fix] Internal fixes to reduce the amount of errors in the test suite.