Organized imports, Fixed qualifiedNameExpr in several places, and added some unit tests.