[case 8945] Added test for fixed targets
[case 8945] Beautified validation