Fixed Test and added some diag output