Build fix

@jedmao pull request with non broken tests.