fix test up and other misc