improve some tests