ticket: 8 Test fixed