fix unit tests
add support for composite and tabular data