Changed some tests