Added tests to shape validator