Fixed tests
Buildserver auto merge