Enhancement to the import, additional and enhancement of the tests.