Improve images test