ticket:2 just a bit changes in tests.