Fix and test prefix imports

Hi Marc, I noticed this bug while experimenting with prefix imports. Please find the (trivial) fix and some additional tests to cover rename/prefix functionality.