Some test fixed