Improve target tests and add additional debug output