Refactoring and some TODOs.
Bug fix in PrefixedName for null object. Extended test with multiple imports and includes added.