[#22] fixed data types
[#24] fixed data types and fixture
[#25] fixed data types