Added first UnitTests. Some Data type Fixes.