Test bench modifications