Fixed tests1