Improve assertion of tests