Fixed tests part4