ticket: 10 Test fixed