fix up tests, having identify issues though