Improve some tests