Improve test and fix it