More debugging for tests