Added further test scenarios, converted tabs to 4 spaces, fixed various bugs with DataTypes module