change to bundle export was necessary, custom types functional now
updated all test blocks to new interface