Simplified data types and created unit tests for them all.