test related stuff fixes