Added test for validation criteria DEV02.
Minor refactorings.