fixes for avoiding test errors