ticket: 5 Test fixed