ticket: 9 Test fixed