fixed several tests