@emir-hasanbegovic Added test support