Pull request #2

test suite and validation