Added tests and fixes for 'Multiple'