Fixed tests, added support for import extend & include