test work, api change
tests commented out while fixing