ticket: 9 Tests added