@emir-hasanbegovic providing more coverage for tests