[feature] Fix tests and test results