Adding some validation tests. Not complete.