@emir-hasanbegovic Added test to cover changes imported from pull request. Fixed pesky brackets