Added functionality and tests for multiple imports