test: improvements