Fixing more test. The idea behind this fix is to be able to run all the test in TeamCity.