[master] Fixed tests