Smaller tests cleanup