Modified dataType checking.
Updated tests.