Added a basic validation testcase
Merge branch 'dev'