Clean up tests

Clean up tests after move to composite types as return instead of Dict.