Fixing build break due to tests