Topic: testing improvements