Added tests for validation