@emir-hasanbegovic Added test coverage for database