added a function name to asserts. Nothing obvious broken, but testing
needed