update tests, fix assertions