Improve code validation scenario