get working tests agaian and remove a bit of debug