Some test fixing