Minor tests cleanup