Added more debugging to tests