Add Better debugging fixed for tests