test: improve some tests