ticket: 6 Tests added