fixed a validation unitTest and expanded