Do not rely on map order for tests
Include caller info in assert functions