Added more tracing to test